*** empty log message ***

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d92ba2ebf36a648de65ac17959ba8191845515cc..2a8eb8be8f4250604ca05b704d44ecd4aee050a7 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
 
        * tramp.texi (History): Add IMAP support.
@@ -9,12 +8,10 @@
 
        * trampver.texi: Set default value of `emacsimap'.
 
-=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
        * gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
->>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
        * dired-x.texi (Technical Details): Delete